Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Mar 2011 07:53:03 +0000 (23:53 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Mar 2011 07:53:03 +0000 (23:53 -0800)
commita5116dbd1e4972a7394f7cecc0ad85f7890fe391
treef2a332a93e2c8feee051ea2f82870fb06541cebe
parent42d480e1b8e39047b40d1e2f6e995ec40aa81d4c
parentdc3cbdd82287812f29bb672078f53fc03e935255
Merge from mainline.
src/ChangeLog